-
Notifications
You must be signed in to change notification settings - Fork 33
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Translate classes to english #62
base: master
Are you sure you want to change the base?
Translate classes to english #62
Conversation
…ls from 7.3.0 to 7.2.0
- Dettaglio -> DetailsActivity - Indirizzo -> AddressActivity - Autore -> AuthorActivity - Cambiamenti -> ChangesActivity - Evento -> EventActivity - Estensione -> ExtensionActivity - Famiglia -> FamilyActivity - Immagine -> ImageActivity - Nome -> NameActivity - Nota -> NoteActivity - Archivio -> RepositoryActivity - ArchivioRef -> RepositoryRefActivity - Fonte -> SourceActivity - CitazioneFonte -> SourceCitationActivity - PulisciPila -> CleanStack - ContaCitazioniFonte -> CountSourceCitation - TrovaPila -> FindStack - ListaCitazioniFonte -> ListOfSourceCitations - ContenitoriMedia -> MediaContainers - ListaMedia -> MediaList - ListaMediaContenitore -> MediaListContainer - RiferimentiMedia -> MediaReferences - ContenitoriNota -> NoteContainers - ListaNote -> NoteList - RiferimentiNota -> NoteReferences - VisitorTotale -> TotalVisitor - Lavagna -> BlackboardActivity - Chiesa -> ChurchFragment - Compara -> CompareActivity - Confronto -> Comparison - Conferma -> ConfirmationActivity - Esportatore -> Exporter - Estensione -> Extension - Facciata -> FacadeActivity - Galleria -> GalleryFragment - Datatore -> GedcomDateConverter - EditaIndividuo -> IndividualEditorActivity - IndividuoEventi -> IndividualEventsFragment - IndividuoFamiliari -> IndividualFamilyFragment - IndividuoMedia -> IndividualMediaFragment - Individuo -> IndividualPersonActivity - Biblioteca -> LibraryFragment - Podio -> ListOfAuthorsFragment - CartelleMedia -> MediaFolders - AdattatoreGalleriaMedia -> MediaGalleryAdapter - Memoria -> Memory - Pila -> StepStack - Passo -> Step - NuovoParente -> NewRelativeDialog - AlberoNuovo -> NewTree - Quaderno -> NotebookFragment - QuadernoAdapter -> NotebookAdapter - Opzioni -> OptionsActivity - TrovaLuogo -> PlaceFinderTextView - EditoreData -> PublisherDateLinearLayout - Anagrafe -> RegistryOfficeFragment - Magazzino -> RepositoryFragment - Condivisione -> SharingActivity - Fabuloso -> SpeechBubble - VistaTesto -> TestView - Lapide -> TombstoneActivity - Confrontatore -> TreeComparatorActivity - InfoAlbero -> TreeInfoActivity - Alberi -> TreesActivity
…ue dividing lines on NumberPicker by making divider color transparent.
…asses 2. Rename DetailsActivity to DetailActivity 3. Translate DetailActivity 4. Rename R.layout.dettaglio to activity_detail 5. Rename dettaglio_scatola to detail_box 6. Rename all instances of "intento" to "intent"
1. AddressActivity 2. AuthorActivity Translate methods 1. Memory.oggettoContenitore() -> getSecondToLastObject() 2. eliminaAutore() -> deleteAuthor()
…translate-code-to-english
…ion(). Replace string concatenation with StringBuilder
…mory.replacePrimo()->...First()
…translate-code-to-english
…giMedia() -> showImage(), MediaReferences.capostipiti -> founders
2. Translate MediaListContainer 3. MedCont.equals(Object), check if Object is MedCont first
It's super easy. Remove root cause on master
--> merge PR |
@Sternbach-Software I suppose the first option should be the best now. @hannesa2 I will try to understand your suggestions. |
@Sternbach-Software I just terminated to resolve a lot of conflicts on sternbach-translation branch: the renaming of files, 4 spaces indentation and more. App is now compiling correctly. I pushed. @hannesa2 But with |
I have finished translating the codebase (except the XML ids)! I pulled your changes to master into my master, and merged translate-code-to-english into my master. |
I am resolving the conflicts now. I would like to discuss something: function naming. The Java convention is to name functions with a verb/action, not a noun. That means, for example, I am OK changing names (I - along with the greater Java community - generally prefer longer but more descriptive names, over short and less descriptive names, but understand the convenience of shorter names). Can we compromise at I will take a hint at your name choices and continue merging conflicts by combining your noun function names with an action. |
Yes, but you apply it after the merge again. As outcome you only re-order of merge. |
I suggested |
Another point, from the official guide to writing Java documentation:
|
You are my hero. Thank you for the explanation, I see the advantage of prefixing a verb to method names. My OK for the 3rd person. @hannesa2 I thought I've got it, but not really. |
That's right, it's preserved in local history. And as long as you don't push you can do what you want. There are several ways back. |
|
I had to change some Gradle stuff to get the project to compile. I appended
Activity
andFragment
to classes as appropriate, because this is the convention, and makes code easier to read. I wasn't 100% sure about some of the translations, such as Anagrafe to RegistryOfficeFragment, or Fabuloso to SpeechBubble. I tried to read the comments and code, and see what the class was trying to do. I used Google Translate heavily, but didn't make a change without thinking about it first. See also #61 .I am starting by translating the classes, then by translating the methods, then the variables, then the comments.